]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Replace deprecated gtk_widget_size_request
authorRico Tzschichholz <ricotz@t-online.de>
Fri, 11 Nov 2011 08:50:18 +0000 (09:50 +0100)
committerRico Tzschichholz <ricotz@t-online.de>
Fri, 11 Nov 2011 08:50:18 +0000 (09:50 +0100)
src/shell-gtk-embed.c

index f1caa93c1fbb4363c967d2d226fcf909edfe04af..fded8ed284f3232086862c0b19882c2cbc95ce18 100644 (file)
@@ -136,10 +136,11 @@ shell_gtk_embed_get_preferred_width (ClutterActor *actor,
   if (embed->priv->window
       && gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
     {
-      GtkRequisition requisition;
-      gtk_widget_size_request (GTK_WIDGET (embed->priv->window), &requisition);
+      GtkRequisition min_req, natural_req;
+      gtk_widget_get_preferred_size (GTK_WIDGET (embed->priv->window), &min_req, &natural_req);
 
-      *min_width_p = *natural_width_p = requisition.width;
+      *min_width_p = min_req.width;
+      *natural_width_p = natural_req.width;
     }
   else
     *min_width_p = *natural_width_p = 0;
@@ -156,10 +157,11 @@ shell_gtk_embed_get_preferred_height (ClutterActor *actor,
   if (embed->priv->window
       && gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
     {
-      GtkRequisition requisition;
-      gtk_widget_size_request (GTK_WIDGET (embed->priv->window), &requisition);
+      GtkRequisition min_req, natural_req;
+      gtk_widget_get_preferred_size (GTK_WIDGET (embed->priv->window), &min_req, &natural_req);
 
-      *min_height_p = *natural_height_p = requisition.height;
+      *min_height_p = min_req.height;
+      *natural_height_p = natural_req.height;
     }
   else
     *min_height_p = *natural_height_p = 0;